Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge v24.3.31 #836

Merged
merged 7 commits into from
Apr 3, 2024
Merged

Merge v24.3.31 #836

merged 7 commits into from
Apr 3, 2024

Conversation

helgeerbe
Copy link
Collaborator

@helgeerbe helgeerbe commented Apr 3, 2024

  • merge v24.3.31
    - create webapp

@schlimmchen
Copy link
Member

schlimmchen commented Apr 3, 2024

.github/workflows/repo-maintenance.yml

Have you thought about adopting this? It's fine with me, I just want to make sure this is not slipping in unnoticed.

add webapp

Is there a particular reason why you do this? I maintain that no build output shall be part of the repo. The commit adds two new files yarn.lock in the repo root and node_modules/.yarn-integrity. I think you accidentally executed yarn in the repo root rather than in subfolder webapp? These two files should be cleaned up.

So in total, I'd like to propose merging ff44267 into master development and drop "add webapp" 😉

@helgeerbe
Copy link
Collaborator Author

.github/workflows/repo-maintenance.yml

Guess it's fine. Would help to do our housekeeping.

I think you accidentally executed yarn in the repo root rather than in subfolder webapp? These two files should be cleaned up.

upps. You are right.

So in total, I'd like to propose merging ff44267 into master development and drop "add webapp" 😉

That's fine for me

@schlimmchen
Copy link
Member

As discussed, I moved the branch tip of this PR to ff44267, which effectively removes the commit I wasn't happy about.

@schlimmchen schlimmchen merged commit 3934906 into development Apr 3, 2024
10 checks passed
@schlimmchen schlimmchen deleted the merge-v24.3.31 branch April 3, 2024 18:08
@schlimmchen
Copy link
Member

FYI: I pushed tag v24.3.31 to this repo, pointing to the original upstream commit 1258865.

Copy link

github-actions bot commented May 4, 2024

This pull request has been automatically locked since there has not been any recent activity after it was closed. Please open a new discussion or issue for related concerns.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators May 4, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants